Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSI installer #38

Merged
merged 17 commits into from
Oct 26, 2018
Merged

MSI installer #38

merged 17 commits into from
Oct 26, 2018

Conversation

codebrain
Copy link
Contributor

No description provided.

@codebrain codebrain requested a review from russcam October 18, 2018 22:22
installer/src/Installer/Installer.csproj Show resolved Hide resolved
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not updated during the build, something to look into during the beta (should we set these to 0.0.0.1 for the moment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had ripped out the AssemblyInfo patching, but I might just add it back in.

installer/src/Installer/Program.cs Show resolved Hide resolved
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use [CustomAction] is this file still needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will remove if I can.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted.


source https://www.nuget.org/api/v2

nuget xunit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be cleaned up to only include the things needed for this project (e.g xunit and fluentassertions are not needed AFAIK)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted.

installer/build/scripts/scripts.fsproj Show resolved Hide resolved
Copy link

@russcam russcam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left some comments.

It also looks like this still has a dependency on Wix Toolset being installed, although it references the nuget package that contains all of the Wix binaries. I think the WixSharp Compiler.WixLocation property needs to be set to the package location, similar to the Elasticsearch Windows installer:

https://github.com/elastic/windows-installers/blob/31989014273124015c92979263d5de96ee463a03/src/Installer/Elastic.Installer.Msi/Program.cs#L196-L200

installer/build/scripts/Build.fsx Outdated Show resolved Hide resolved
installer/build/tools/vagrant/Vagrantfile Show resolved Hide resolved
installer/build/scripts/Products.fsx Show resolved Hide resolved
installer/build/scripts/Products.fsx Outdated Show resolved Hide resolved
installer/src/Installer/Program.cs Outdated Show resolved Hide resolved
installer/.gitignore Show resolved Hide resolved
installer/src/Installer/CustomAction.config Outdated Show resolved Hide resolved
installer/src/Installer/Program.cs Show resolved Hide resolved
installer/src/Installer/Program.cs Show resolved Hide resolved
installer/src/Installer/Program.cs Outdated Show resolved Hide resolved
@codebrain codebrain mentioned this pull request Oct 24, 2018
Copy link

@russcam russcam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM. Just left one small comment

[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyCompany("Elasticsearch B.V.")]
[assembly: AssemblyProduct("Elasticsearch ODBC Installer")]
[assembly: AssemblyCopyright("Copyright Elasticsearch B.V. ©")]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this include the year?

@bpintea bpintea merged commit 7734918 into master Oct 26, 2018
@bpintea bpintea deleted the msi-installer branch October 26, 2018 08:43
@bpintea bpintea mentioned this pull request Nov 1, 2018
Closed
@bpintea bpintea added >feature Applicable to PRs adding new functionality v6.5.0 labels May 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>feature Applicable to PRs adding new functionality v6.5.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants